- Manually replace path separators before anything else
- Use pathSeparator instead of literal char
- Use isPathSeparator predicate

(cherry picked from commit d0bd687)

# Conflicts:
#	cabal-install-solver/src/Distribution/Solver/Types/ProjectConfigPath.hs

- Add else.project test
- Use normalizeWindowsOutput
- Add a changelog entry
- Update expectation
- Use concatOutput on needle
- Include output
- Align lines
- Show modified output
- Apply concatOutput to the needle
- Show start and end of lines with ASCII ^ and $h
- Can't print pilcrow so use grep char for marking end of line
- Marking the start of line distinguishes "expected" intro from its content too, same for "output"
- Use \n in multiline string expectation
- Add NeedleHaystack
- Add expectNeedleInHaystack field to NeedleHaystack
- Remove 3 assert*Contains functions
- Add TxContains record
- Apply the txBwd transformations before display
- Add displayHaystack field
- Switch to using <EOL> as the marker
- Sort language pragmas
- Use ++ rather than cons with reversals
- Rerun ParseErrorProvenance test
- Add doctests for single line strings
- Read exected multiline string from file
- Use lineBreaksToSpaces
- Add module Test.Cabal.NeedleHaystack
- Redo ConditionalAndImport with multiline expectations
- Add test of string expectation start and end marking
- Rename encodeLf and decodeLfMarkLines
- Rename original concatOutput to lineBreaksToSpaces
- Add assertOutputContainsWrapped
- Use multiline and wrapped assertions
- DedupUsingConfigFromComplex multiline assertion
- Remove redundant tests that fail on Windows
- Use normalizeWindowsOutput in ConditionalAndImport
- Forward conversion applied twice by mistake
- Easier diff when assertOn follows assertOutputContains
- Add readVerbatimFile
- Have readVerbatimFile read contents strictly
- Add normalizePathSeparator
- Don't modify path separator for URIs
- Don't normalize path with anything URI-like
- Normalize expected output
- Rename to normalizePathSeparators
- Add an explicit export list to NeedleHaystack
- Drop unlines . lines added trailing newline
- Show example of normalizePathSeparators
- Use local unsnoc definition to avoid CPP
- Define local unlines
- Satisfy fix-whitespace
- Don't use <EOL>
- Rename to delimitLines
- Rename the changelog with *.md extension
- Add a section on cabal-testsuite changes
- Rename the function to readFileVerbatim
- Add to contributing and cabal-testsuite's readme
- Use setup for the noun
- Typo s/displaying/display
- Typo "can easier"
- Use unsnoc from Cabal-syntax Utils.Generic
- Add a note [Multiline Needles]
- Remove doctests available elsewhere
- Substitute encodeLf for concatOutput for assertOutputMatches

(cherry picked from commit 30f5d3f)

# Conflicts:
#	CONTRIBUTING.md
#	cabal-testsuite/cabal-testsuite.cabal
#	cabal-testsuite/src/Test/Cabal/Prelude.hs

(cherry picked from commit 484ac9c)

# Conflicts:
#	cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFromComplex/cabal.out
#	cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFromComplex/cabal.test.hs

- Add oops.expect.txt
- Add cabal-missing-package.expect.txt
- Add hops.expect.txt
- Add DedupUsingConfigFromComplex/errors.expect.txt
- Add using configuration from to errors.expect.txt

(cherry picked from commit 32b820b)